]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
screenShield: Remove key press event handler
authorGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>
Fri, 29 Nov 2019 17:33:26 +0000 (14:33 -0300)
committerFlorian Müllner <florian.muellner@gmail.com>
Mon, 10 Feb 2020 22:30:52 +0000 (22:30 +0000)
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872

js/ui/screenShield.js

index fe8329d0905a4a62853ff291c40731cb787be593..b534a7b02fcc4fc7691c6ef9d1625a78b32cfac1 100644 (file)
@@ -55,8 +55,6 @@ var ScreenShield = class {
             name: 'lockScreenGroup',
             visible: false,
         });
-        this._lockScreenGroup.connect('key-press-event',
-                                      this._onLockScreenKeyPress.bind(this));
         Main.ctrlAltTabManager.addGroup(this._lockScreenGroup, _("Lock"), 'changes-prevent-symbolic');
 
         this._lockDialogGroup = new St.Widget({ x_expand: true,
@@ -194,36 +192,6 @@ var ScreenShield = class {
         return this._isModal;
     }
 
-    _onLockScreenKeyPress(actor, event) {
-        let symbol = event.get_key_symbol();
-        let unichar = event.get_key_unicode();
-
-        // Do nothing if the lock screen is not fully shown.
-        // This avoids reusing the previous (and stale) unlock
-        // dialog if esc is pressed while the curtain is going
-        // down after cancel.
-
-        if (this._lockScreenState != MessageTray.State.SHOWN)
-            return Clutter.EVENT_PROPAGATE;
-
-        let isEnter = symbol == Clutter.KEY_Return ||
-                       symbol == Clutter.KEY_KP_Enter ||
-                       symbol == Clutter.KEY_ISO_Enter;
-        let isEscape = symbol == Clutter.KEY_Escape;
-        let isLiftChar = GLib.unichar_isprint(unichar) &&
-                          (this._isLocked || !GLib.unichar_isgraph(unichar));
-        if (!isEnter && !isEscape && !isLiftChar)
-            return Clutter.EVENT_PROPAGATE;
-
-        if (this._isLocked &&
-            this._ensureUnlockDialog(true) &&
-            GLib.unichar_isgraph(unichar))
-            this._dialog.addCharacter(unichar);
-
-        this._activateDialog();
-        return Clutter.EVENT_STOP;
-    }
-
     _syncInhibitor() {
         let lockEnabled = this._settings.get_boolean(LOCK_ENABLED_KEY);
         let lockLocked = this._lockSettings.get_boolean(DISABLE_LOCK_KEY);